When looking up a font XID, add the XID_FONT_BIT. (#348001)

2006-07-19  Matthias Clasen  <mclasen@redhat.com>

	* gdk/x11/gdkx.h (gdk_font_lookup_for_display): When looking
	up a font XID, add the XID_FONT_BIT.  (#348001)

diff --git a/ChangeLog b/ChangeLog
index 0d1560386faba7ab36c0b7fb08262dd9c19336ed..13f5d860b35b0c626818f0f90d902954fdbb6cf1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-19  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk/x11/gdkx.h (gdk_font_lookup_for_display): When looking
+       up a font XID, add the XID_FONT_BIT.  (#348001)
+
 2006-07-19  Richard Hult  <richard@imendio.com>
 
        * gdk/quartz/GdkQuartzView.c ([GdkQuartzView -drawRect:]):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0d1560386faba7ab36c0b7fb08262dd9c19336ed..13f5d860b35b0c626818f0f90d902954fdbb6cf1 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-07-19  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk/x11/gdkx.h (gdk_font_lookup_for_display): When looking
+       up a font XID, add the XID_FONT_BIT.  (#348001)
+
 2006-07-19  Richard Hult  <richard@imendio.com>
 
        * gdk/quartz/GdkQuartzView.c ([GdkQuartzView -drawRect:]):

diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h
index 1e9f1f1fb1e41bf3a73afefbe147a42bc87e83ad..f07a5883e776ef6d2963e801c031f5e5dcc07f2c 100644 (file)
--- a/gdk/x11/gdkx.h
+++ b/gdk/x11/gdkx.h
@@ -187,7 +187,7 @@ void        gdk_x11_register_standard_event_type (GdkDisplay *display,
 gpointer             gdk_x11_font_get_xfont    (GdkFont *font);
 #define GDK_FONT_XFONT(font)          (gdk_x11_font_get_xfont (font))
 
-#define gdk_font_lookup_for_display(display, xid) ((GdkFont*) gdk_xid_table_lookup_for_display (display, xid))
+#define gdk_font_lookup_for_display(display, xid) ((GdkFont*) gdk_xid_table_lookup_for_display (display, ((xid)|XID_FONT_BIT)))
 
 #endif /* !GDK_DISABLE_DEPRECATED || GDK_COMPILATION */